Merge from emacs-23 branch
authorChong Yidong <cyd@stupidchicken.com>
Thu, 7 Jul 2011 16:18:48 +0000 (12:18 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Thu, 7 Jul 2011 16:18:48 +0000 (12:18 -0400)

Trivial merge